some minor changes, commands are not working yet