few bugs fixed resulting in compilation errors)