several fixes

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