updated versions, bcc uses only use 2 macros and switch less, fix loc in florist