fixes for 30 issues