tidyed up class and doc and java~