Solving the last issues before rendering (read: inches away from turning into The Jonkler)