Add new comment

Bug fixes and optimisations.

Add A Comment