some nicities and cleanup