Add comments
Finalize beta