General bug fixes and performance improvements

**We always love to hear your feedback. If you have any comments or queries please contact us at [email protected]**