API alteration and some misc stuff