Fixed out bitshift issues, and added some new features