Added signals & various fixes