Improving comments and adding mass inputs array