fixing some stuff
some small modifications, functionality enhancements, etc