convention rennaming
cleaning + bugfixs