remember to require file lock
more fixes