Added userID (IP) validation and extra fixes