minor fixes and readded some includes
fixed includes