Added new commands, fixed preferences