Clean up, fix bugs
Signed-off-by: Zeklandia <awood5659@gmail.com>