Fixed some vary features