Added attributes to form a, minor fixes and testing