Implemented aes psi, small community cleanup