Did a lot of fixes on backend stuff, little bit left to check...