fixed issue #2 and issue #3
update from unstable r58
still unstable
fixed incorrect overrides
override fixes