Some more commands, updates and bug fixes..