fixed more issues with additional data