unfinished setup fixes