a few little addings and cleanup
minor changes