I merged several filed and changed a few things based on feedback, also spent time on server and cleaned up the mySQL database