allot of fixes and completions