Clean up
Merge branch 'master' into grapefruit
Clean up and rewrite to C
Clean up and rewrite to C
Merge branch 'master' into grapefruit
Fix misc errors
Merge branch 'master' into grapefruit
Fix