Fixed some API issues, still lots of mut-problems