Some updates, comments as draft