fixing various bugs
delete comments