added some item types
moved command parsing