made some basic changes