-added some goodies and improvements