some updates, things look a bit nicer now