Moved log.h and updated some stuff