fixed data consistency issue. Made shit uglier in the process. Will clean up now
added new files