improvements

Will be removed soon..... hopefully......