Thanks @Kreashenz  Bug fixes - We are almost home baby!