Cha... cha... cha... changes

Some changes to some stuff... it's all legit.