fixed bugs - rebase comment :D
lol