Simplified Aspect parameters, fixed some javadoc.