Trying to fix alignment and other errors :/