Fixed many little things