small changes
cleanup
integrated!