fixed things/cleanup and example