Random bug fixes woohoo