(Angrylion) More additions/changes