In Progress

Code fixing/code enhancements