less crappiness and a rename to match the project name