Bug fixes

This should NOW work flawlessly.