bugs are ints and temp fixes for security issue cleanout