solved basic bugs