More standards

Fixed logs, reverted back to old log system