fixed final bugs :)