minor fixing, will do more when I can