added bttf, cleaned up other stuff