Added basic coverage, some fixes.