small bug fixes in the code"
change require statements for better looking