fix problems/remarks, seems like it's working like it should now...