Addressed some comments + other misc changes