Cleaned up a bit and (wip) added more options