minor edits
add back skeleton type inference