Various changes, forms have changed a lot and error/file handling