Some fixes and feature implementations.