Fixing alignment, removing test stuff