Actions now take up time!

Only clean up though
worked a bit more on NPCs