namespace fix
some cleanup, licensing, comments, and a task delay