fixes. progress. woo.