did a lot of stylizing, some logic fixes