Fixed some problems and added time to transactions