Fixes, help works, but is ugly