v3.6.4.0

Added a few items as requested.
Made small changes to adapt API changes