various improvements, many deprecated methods