added resolution functions per primitive, for easier readability
updated resolution functions for new names
integrated some of the new resolution functions