bug fixes

the R.java is all messed up, not sure if we can fix that