fix parsing (again), add module access