fixed assignment bugs and Skylight bug