cleanup
cleanup + datetime
h1 fix