Fixed up Custom_Post_Type a little