Updated comments, resolved mouse trailing