Cleaned drugset initialization dataset
Fixed some model reference bugs
Fixed location related bugs