minor updates
merged conflicts
fixes and stuff