lots of fixes
working on result screen