Some updates

Any fixes + optimization