Fixed Problems listed by Vswe. Ready for Submision 1.1