File size type conversion; general clean up and update