removed further bugs