Source cleanup. added some things to the rake files