Updated, fixed and added many stuff