fixed indentation, downcased some names, fixed file handlers