retouching forms / general cleanup