made some basic fixes.