Various updates, including better 2D support