Added some output options. Right now code is super-dirty, should refactor it anytime soon...