Fixed whole heap o things