1st batch of bugs fixed
delete obsolete files