Closed some improvements and added new one