morning commit w/ yesterday's fixes

nasty instance detection + buggy reading fix