Made more improvements and added some commands