space to tab and bug fixes