keyword fix + double submit fixes.