More tweaks, added 'inactive' feature