Some tweaks.. last commit btw