fixes and new stuff