added some tools & cleaned up a few technicalities