merged features/fixes from Frankinstine