bugfix + cleanup

fixes bug with > 2 forms