finish the app... onlypolishing remains
some bug fixing