groundwork for future updates

bug fixes and ground work for future updates