Last Changes

Fixed/added comments
Fixed minor bugs