added aliases for better self-documentation
many changes....