file limit + other fixes