Reformatted and added experimental support for sun parameters.