Code changes from project user one

Please find the added bug fixes and code changes from projectuser one