More fixes and updated the drawable package and constructs