some more stuff working 8.12 14:35