finalized code, javadoc added, ant builder updated