Add comments and ongoing bug-fixes/tweaking