Continued changes of hidden singles

Still not completely done though