Added options and colors and such and generally tidied up