changes and connection between calc and form
added minor fixes