slight bug fixing; cleaning