Cappuccino updates and some bugfixes