Bux fixes and improvement