Minor fixes; better error handling with net file