Fixed conception errors and bugs