Final for submission

bug fixes