Code Refactor. Fix broken features.