Crapload of misc. errors fixed