Fix bugs / enhance client side level logic and bonuses