Enhancements for Topic Assignments

#4 & #15 should be taken care of with these commits.