removed the "active" stuff, also fixed some bugs