Comments by aewol

@Amselcom email any ideas across and I'll try to implement whenever I get the time to update :)