More code cleanups
Updated slackroot - still need to test!