misc fixes and cleanups

Signed-off-by: dvorkinista <villain@noironetworks.com>