timestampable and more fixes