Review

a lot of code changed
no settings any more?