Minor, and added todo popup script (alpha)