updated minor stuff
updated minor stuff
merged
same everything nice so that we have no compilation errors. good job will