diff --git a/uart_aes/rtl/uart_aes.vhd b/uart_aes/rtl/uart_aes.vhd
index 6b88dd6..3fc9fad 100644
--- a/uart_aes/rtl/uart_aes.vhd
+++ b/uart_aes/rtl/uart_aes.vhd
@@ -1,8 +1,8 @@
--- This design implements a register file which can
+-- This design implements a AES-CTR unit which which can
 -- be accessed by an UART with 9600 baud
 --
 -- See into uart_ctrl.vhd for documentation of the protocol
--- used to read / write the register file.
+-- used to read / write the AES-CTR registers.
 
 
 library ieee ;
diff --git a/uart_aes/syn/Makefile b/uart_aes/syn/Makefile
index ad1317c..caade7a 100644
--- a/uart_aes/syn/Makefile
+++ b/uart_aes/syn/Makefile
@@ -4,8 +4,6 @@ AES_DIR   := ../../cryptocores/aes/rtl/vhdl
 CRYPTO_SRC := \
   $(AES_DIR)/aes_pkg.vhd \
   $(AES_DIR)/aes_enc.vhd \
-  $(AES_DIR)/aes_dec.vhd \
-  $(AES_DIR)/aes.vhd \
   $(AES_DIR)/../../../ctraes/rtl/vhdl/ctraes.vhd
 
 WORK_FILES  := \
@@ -21,8 +19,15 @@ GHDL_FLAGS  := --std=08 --workdir=build -Pbuild
 ICARUSFLAGS := -Wall -Winfloop -g2012 -gspecify -Ttyp
 
 YOSYSPIPE   := -nomx8
-PNRFLAGS    := -om 3 -cCP on
+# yosys -nomx8 option has to be used as GM FPGA hasn't any (working?) MUX8 cells (in contrast to documentation)
+# yosys -retime option causes design AES unit misbehavior (wrong results)
+# yosys -dff option can be used without risk (but leads to 2.5 mhz less fmax)
+
 PNRTOOL     := $(shell which p_r)
+PNRFLAGS    := -om 3 -cCP off
+# p_r +cCP option causes design AES unit misbehavior (wrong results != retime results)
+# p_r +sp option causes design AES unit misbehavior (wrong results != retime results != cCP results)
+# p_r +cCP with +gCP also breaks UART
 
 
 .PHONY: all syn imp prog syn_sim imp_sim