TidyUp and fixing some issues.