stand prep + stuff
more coms changes
Merge branch 'master' of http://github.com/siyuanfeng/jimmy
touching main loop
Merge branch 'master' of http://github.com/siyuanfeng/jimmy
all hooked up