Applied some ideas and enhancements to the project
Applied noted ideas and enhancements + minor bug fixing