Added new features/tweaked some stuff (credit: Ryuinferno and Show-p1984)