corrected case and some structure fixes