20140129:COMPLETE:Fixed some small issues