Well the first I could implement, the second is planned already. :p