cleanup and small fixes
I hate organge