the basics fixes