Cleanup and fix offset, update Version 0.3.2