Update

Commented and bugs fixed