- much more fixes to get the code working with the changed framework

Signed-off-by: schmunzel <schmunzel@swganh.org>