Static re-fixed

Static errors gone, player collision working slightly better (no idea
why)
Connor's pretty code remained.