Minor fixes and alignements