Variousimprovs/fixs