fun time more fixes :)