More work & Bug fixes