Merge pull request #83 from Tincer/master

Opps Forgot dones bays
Cleaned up some logic should work
 -- and
fixed      the s p a c i n g for rayu :D
--- Trincer