Forgot to test last commit, fixed bugs.