Development improvements and comparator fixes