problem 2 is... a bit embarassing, hopefully I'll have time to spare to fix it up