All comments added, final commit