Added raypower and cleaned stuff up!