reduce files, add funcs
micro fixes