Sternchen ALL the things

Follow-up to #40. :) @ntlk