Add comments and add any fixes.