Merge "add errors and align style"