fixes, will test after cleanup