Justin bugs

added final code before submission