tweaks and fixes
more indexes
handling form submit without redirect