updated types and resolving of lists, not done yet though