Cleanup and haar

Haar working in bigger frame