Fixed and added more featues.

yes