fix pot angle handling, cleanup