Fixes etc, seems working now