More changes and stuff.. still not atisfied with cube generation