Watch error fixed, flipper and box classes cleaned