last bit of drag/resize bug
merging
Merge branch 'junjun'

* junjun:
  ..
pretty clocks
Merge branch 'junjun'

* junjun:
  ..
  ..
personal