fixed tedious stuff