small fixes for now, will make more tomorrow