Bux fixes + outline and JavaGenerator