Minor fixes, added user timestamps