Cleaned up the code a bit + added in all missing commands