Added overlay and fixed bugs