cleaned up imports, added in red blocks, chasing down bugs.