Minor updates, forms look good