Added empty and bug fixes