fixed some small bugs
fixed issue (maybe!)