Added some small fixes and customizations