changed server to unicorn
merged some stuff