Minor non-functional fixes.
Implemented support for transferables + minor non-functional changes.