Bug fixing

More customisation etc