a lot of fixes mostly related to static/self binding