Quick fix for thumb bug
Further cleanup and thumb bug hack