work on subdivision (+various improvements)