Fix several bug + issues + new commands