fixes on the last commit. works now.