bug fixes, tweaks, non-working routine form