added last bugs