Fixed dirty comments (thanks, Ivan...), fixed storage/runtime