fixing last bugs