Minor addons, better commented code