-- 15092013 - update
-- 15092013 - update, fix several errors