Separate header to partial, minor fixes