Bug fixes add custom features