Added :tilde type and cleaned up