New Features

Fixed issues