various fixes and marmalade audio