Last features and bugs fixes