bugs fixed in all classes