finishing last bugs I think