Made stuff more better (mostly buildable)