changed something
fixed most warnings
merged