implemented inflate; minor changes