stole some stuff from faned :D

is.gd/sauer_faned
aaaaaaaaaaaaaaaand some fixes