some minor fixes and got interest form working