Add boyd modifications + bugfixes