fixes after failed attempts to improve