fixes #79
fix static and instance method issues. change everything to use  instead of .