updated thesis and java sources