last bugs fixed