ADDED more commands + bug fixes
ADDED more commands + bug fixes