More elegant way of handling cornerpin and all export
FIxes default arguments in init