cleanup and fixes

Signed-off-by: Keff <funnykeff91@gmail.com>