Updated with bugs and supported commands