Fixed display and bounds checking

Remove debug code before starting actual work