More Features, fixes, etc.