make some attributes not null, use enum where appropriate

make some attributes not null, use enum where appropriate #5