Fixed a couple of things and added some requested stuff...

Signed-off-by: Swizzy <swizzy@xeupd.com>