Things start to look better now

Did a lot of stuff, too tired to mention it here :-D