Fix and improve some stuff
Attempt to handle commands