fixes, documentation, less redundancy