File reading and some minor tweaks