Added a little more customization and a couple bug fixes