Feature/embed issues

@paddymul  can you give this a once over?