fix some more stuff and gen source maps