Fixed some bugs, added new instructions