Form error corrections & code cleaning + comments