Bug-fixes and customization