bug fixes making moduls more modular