alignment improvements
get rid of unions for simplicity sake