Addressed most comments