cleaning + fixes