remove logs
fixed some bugs
changed a lot