refactoring
add bootstrap hack comment
fixed point loss time editing bug
Merge branch 'master' into kettle-deployment