cleaned up code and added some targets