maybe more clean.. and fix some broken sink