Update to 0.4.14 MAJOR REFACTORING AND CLEANING part 1