fixed major error with aligning, really cleaned up