Minor fixes and added customisation