fix for using static methods; minor stuff