Adding entropy placeholders.
Fixing bugs, more exist.