fixing the issues in the currently build system
and made it runnable to the live server