quick fixes, package orientation and no more warnings