Parse modules correctly, minor improvements.