small spacing & bug fixes