Some kinda random code changes...