cleaned up, added some info