Added some form annotations and fixed a bug with getting the right model