initial commit/bug fixes