Various fixes: adding rotation (not fully working yet)