merged changes from another machine
tweaks
merged branches