some bugfixes (pretty embarrasing sry on that one) xoxo