some fixes and overlay