fix for lots of issues