static public etc support + bugfixes