Some small fixes and added activate signal to input