Much bug fixing - proper alignment