fixes based on comments, added TODO's for later fixes