last bugs
fix