done some more stuff, should now work...