updated some stuff. Yeah this is a really useful commit msg isn't it?!