form fix and string problem resolved, ready for pull