Added missing options and lots of improvements