Changed pos
Fixed the blackholes and some little things.
Merge commit '155f5d243072b6374eddd38104d6b1b684eb612d' into development
Added Andreas stuff!
Merge