moved away from magic __get/__set/__call + minor bugfixes