Bugfixes (a lot) and almost finished modmaanger