3/4 *done* minor fixes