Some Updates

Some ARM updates and bug fixes. Still debugging currently.