last commit I hope Pierre didn't fuck it up
merge
fixed ui errors