fix important bug + fix issues with makeactive