[FIXED] Many, many updates