fixed last bugs - finished!