Implemented typechange; fixed tags; restructured