Fix status, add more options and maybe more.

Electroid told me earlier today in Mumble that I should help code on GitPull, which was missing a lot of features so I did. I fixed the bugs and added more features to make it work good. Thanks.
why is all of this commented code here?  if you're not using it, get rid of it.  if you are using it, refactor it - it's messy.