Some tweaks, thanks Ragnor!