Clean up field properly now
A bunch of other minor fixes

Signed-off-by: Hin Lam <max21226@Hin-Lams-iMac.local>