more fixes
not quite there yet

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