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.
I know it's not needed, but if we ever add more code in that if-statement, then it creates an unnecessary diff.  It's just style.