Proper sign system and various changes