simplifies table creation
adds a orceHours parameter
return of the tilde
Merge branch 'master' into js-improvements
uses the new orceHours parameter
breaks stuff